Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Fix for intent namespace check." into oreo-mr1-cts-dev am: d2972ed8 -s ours" into pie-cts-dev am: bc4bcf7c -s ours"