[automerger skipped] Merge "Backport missing permission check for querying...

[automerger skipped] Merge "Backport missing permission check for querying main activity intent" into sc-dev am: 967cdc55 -s ours

am skip reason: Merged-In Ib233ad754a6c6e3c4e0d0e10ed788ab8e055cccc with SHA-1 b3192809 is already in history

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



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