Merge "Check underlying intent as well as intent selector" into tm-dev am: 1439f3d7

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



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