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

[automerger skipped] Merge "Check underlying intent as well as intent selector" into udc-qpr-dev am: e2922293 -s ours

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

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



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