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

[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a72918 -s ours am: df0b2e99

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie1217436408739f926bd3958df835fe9f281288b