Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Whitelist android.intent.action.View" into oreo-cts-dev am: b579d910de  -s ours" into oreo-mr1-cts-dev am: f21213ef69  -s ours" into pie-cts-dev am: 2d9065b54f  -s ours
am: 3994b537b2

Change-Id: I2044904a59856c4a3a7744f1790fdc47bb26724d