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

Bug: 343100748
Merged-In: Iea653c38c266308b475689f080fd2342618085cb
Change-Id: Ic83a8f2d1010a198205f099a811357ea523583a4