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

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee2 -s ours am: 589f5387 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cd0880df0f5c6a802a0275abf7fad619366e00e