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

Bug: 343100748
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I085b9bae6ea33c255634fe4406b41bf9f3502efe