Merge "[automerger skipped] Merge "DO NOT MERGE: Fix for intent namespace check." into oreo-cts-dev am: 250890dc -s ours" into oreo-mr1-cts-dev am: cf7daefa -s ours Change-Id: I554894311ab6286211dfe65a9094a9bc44a60ba8