[automerger skipped] Merge 24Q3 to AOSP main am: add25e2b81 -s ours am: b028f58a39 -s ours

am skip reason: Merged-In I8474e73e2714ee72633075aeb8de710f19f813fa with SHA-1 9d3826700d is already in history

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

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