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

Merge "[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into rvc-dev am: 3c4f0c49 am: a7026c2e -s ours" into sc-dev am: ec2ec1c6 -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/+/13307948

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0720612a5d7bb051e2c7f2ffa9a6c25665ac62c7