[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into oc-mr1-dev am: f4a729180c -s ours am: df0b2e9939 am: a4e5fdf10a am: 06885a559e -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1965d89c65d8aade99712ddda251a6e332eb3f2