[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 667b7f5d7a -s ours

am skip reason: Merged-In I26f0ed9e921beac762f3f9e6aaceb1002ad4801a with SHA-1 176f186a6d is already in history

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

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