[automerger skipped] Merge ab/AP4A.241205.013 into aosp-main-future am: c7ff9cc0af -s ours

am skip reason: Merged-In Ia507354f42959ce9d320114a313bfc533186b524 with SHA-1 9aa005b657 is already in history

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

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