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" am: a1b90a0687  -s ours
am: 80e6cc690b  -s ours

Change-Id: I8c9a99c337e75ebfc2d5e8adb9319ddd220d3002