[automerger skipped] Merge "Backport missing permission check for querying main activity intent" into sc-dev am: 967cdc5544 -s ours am: 89e0dcf643 -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: Id6ae4b22c74bc7429e58f6c0d6177f0321bcdce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>