[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am: 848a909f3d -s ours am skip reason: Merged-In Iaa1d8352b628aeb47f79a5c8e59256a3c45a2909 with SHA-1 c53bf7890a 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 <[email protected]>