[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fb1414ea78f2b43530287482440b286805bcfdd