[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 9a9e10609d -s ours

am skip reason: Merged-In Id70ceed141e2106f746d4a0e68a09675ba45dd28 with SHA-1 9c09196dfd is already in history

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

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