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

[automerger skipped] Merge "Check underlying intent as well as intent selector" into udc-dev am: a0771817 am: 13606f3f -s ours am: 3158249e -s ours

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

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



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