Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future

Bug: 343100748
Merged-In: Iab5f1b4f6a7c4496514cdef577b210a34420aaaa
Change-Id: Iab2b9d2114e738dc789b1e922581392a3335dad4