[automerger skipped] Merge 25Q1 (ab/12770256) to aosp-main-future am: 2ba372343b -s ours

am skip reason: Merged-In Ic4d9d6c4f79325a5d7ab98eafa1c86db4c2e67a5 with SHA-1 9c58954488 is already in history

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

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