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

Bug: 343100748
Merged-In: I5add8910a272bbd95824ec5cdc0472add775552b
Change-Id: I60b79fb4250a7e6b8c88a4beba7df5ca0cfef7c8