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

Bug: 343100748
Merged-In: I094b8e4d855179ff5047500bc6a1419ea05c296f
Change-Id: If59569f037fa3eddeed46f735c5b772d173c4b4e