[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to...

[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 4e3992b0 -s ours

am skip reason: Merged-In Ie439b2d661617f10bbc31afada187a313dd52af7 with SHA-1 3e64dabb is already in history

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



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