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

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into qt-qpr1-dev am: 35f36d2d -s ours am: 4a241c28 -s ours am: aa11921d -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/+/13307475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2210f13f9dd031a55d2c98a5b3f2d56fcdb7a9f9