[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 848a909f -s ours

am skip reason: Merged-In Iaa1d8352b628aeb47f79a5c8e59256a3c45a2909 with SHA-1 c53bf789 is already in history

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



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