[automerger skipped] Merge "Require a more specific intent" into pi-dev am:...

[automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b -s ours am: 1d9d0f28 -s ours am: 03d8fff6 -s ours am: 2535813d -s ours

am skip reason: Change-Id I8f721ca659d58271880a7adbf386b270b331e55b with SHA-1 d16e86f4 is in history

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

Change-Id: Ic67f07a22b131d0b165f2fd0b479e8d37fa7ce53