[automerger skipped] Merge "Check underlying intent as well as intent...

[automerger skipped] Merge "Check underlying intent as well as intent selector" into tm-qpr-dev am: 3d4add86 -s ours am: f9bcd249 -s ours am: fb18bb23 -s ours

am skip reason: Merged-In If04e1020fc5a09f04630ba08d7e3b3012f2aa577 with SHA-1 60df29f1 is already in history

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



Change-Id: Ibe52998f564c46e900b2e3fa5ae5510a4b7658d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>