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

Bug: 343100748
Merged-In: I57ff2ec2758f965a9e13e53f223c735a9d102219
Change-Id: If2bbd89a993ed54f61a726910c891eb7506ff1fc