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

am skip reason: Merged-In Ib3b9baf24d3f0d5622ae63f11aa564df35fd14df with SHA-1 b843fb4c09 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/27555521

Change-Id: Iaff78f17b9fe0eebff1ba026edcd3e571409d0d2
Signed-off-by: Automerger Merge Worker <[email protected]>