[automerger skipped] Merge "Merge 24Q4 into AOSP main" into main am:...

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

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

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



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