Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist android.intent.action.View" into oreo-mr1-cts-dev am: 1503fb1578  -s ours" into pie-cts-dev am: b48a0d0e9d  -s ours am: 0dfe535a68
am: e19471828f  -s ours

Change-Id: I981a517c9b1dac310440433be00ad0dd38b5b35f