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

[automerger skipped] Merge "Check underlying intent as well as intent selector" into tm-dev am: 1439f3d7 am: f0887270 -s ours

am skip reason: Merged-In If04e1020fc5a09f04630ba08d7e3b3012f2aa577 with SHA-1 39b5b45b is already in history

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



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