[automerger skipped] Merge "DO NOT MERGE: Whitelist android.intent.action.View" into oreo-mr1-cts-dev am: 1503fb1578  -s ours am: 817ddc1be1  -s ours
am: f41d9c6ae1

Change-Id: I910fb3752af63a25f7dda3b32d462e8a43c0d2a1