Merge "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"