[automerger skipped] Check underlying intent as well as intent selector am: eef07820 -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: I9b9e52ff5f39f33335cdce374587c64f9a7ceccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>