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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If3a42027376c2e65eab1219c9791f6862cc30ca5