[automerger skipped] Fix permission bypass in legacy shortcut am: b7b192bd7f am: a30a52e708 am: 7446209d60 am: c08b5f4760 am: 2da64fb9ee am: 588cd6ac30 am: bb11300545 -s ours am: 6d1d921102 -s ours am: f601a059a9 -s ours am: 989b702db0 -s ours am: 982b03e116 -s ours

am skip reason: Merged-In I8d0cbccdc31bd4cb927830e5ecf841147400fdfa with SHA-1 602cb48c72 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24751391

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