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

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

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

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