[automerger skipped] Merge "DO NOT MERGE: Whitelist android.intent.action.View" into oreo-cts-dev
am: b579d910de  -s ours

Change-Id: I4af55e2adc2fd30daa5fce204341310bd2b670a7