[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: eb3d11af -s ours am: 846add2c -s ours am: 395214dc -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/+/31508276



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