[automerger skipped] Merge "Require a more specific intent" into pi-dev am: 536cef1b06 -s ours am: 1d9d0f28e2 -s ours

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

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

Change-Id: I34ae9eaa6f32a499f5ee2ee404d1d7ec419984be