[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be...

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a72918 -s ours am: df0b2e99 am: a4e5fdf1 am: 06885a55 -s ours am: 290cbce8 -s ours am: f5682c03 -s ours

am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib892b55975b2be2d9614aa7f9be179203c1f8ee5