[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 3b0deb9ab7 -s ours am: bf5332b378 -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: I6237a3a466487b9cdf914d3f5965ccaabfa8c8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>