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

Bug: 343100748
Merged-In: I1051ed664b1f3cbb2409664a168cc115d75308e1
Change-Id: Ia8e6cfdced991eb8c21a058e65484d972279de18