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: Ic5b0c524d6af500b694fade3d4d3424396c91a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>