[automerger skipped] Merge "Hide shortcut helper on all apps" into 24D1-dev am: a9adb0dc -s ours

am skip reason: Merged-In Ib979cf45b68aad8bac4a73582e794351b15f4721 with SHA-1 2f0ffaa6 is already in history

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



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