Merge "Check underlying intent as well as intent selector" into udc-dev am: a0771817

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



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