[automerger skipped] Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future am: 8d61e06a98 -s ours

am skip reason: Merged-In Icc555cad17b734e2a9c035991c19bbdc6b02de5d with SHA-1 aeecb1e8a5 is already in history

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

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