[automerger skipped] Merge "Only allow BROWSABLE && DEFAULT Intents to be always opened" into pi-dev am: 47fb5ee20c -s ours am: 589f538708 -s ours am: 06985dae13 -s ours am: a297374f96 -s ours am: 4186f7df67 -s ours am: c261534d10 -s ours am: 437ba0550b -s ours am: efffe8f17e -s ours
am skip reason: Change-Id Ib957258735893bf2779bed19bd400c6726ee6478 with SHA-1 a154d7a648 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13307947
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibbc0f0b56598db96fd41fd4a1fc56089f0b3d862
This commit is contained in: