[automerger skipped] Check underlying intent as well as intent selector am:...

[automerger skipped] Check underlying intent as well as intent selector am: 39b5b45b -s ours am: b1300783 -s ours am: ee957999 -s ours

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

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



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