[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: 4049c231 -s ours am: 576f1075 -s ours am: 5df1a7dd -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: I8e1fa3e6b0d4330b0302148dc98d4f2bc0f5186d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>