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

Bug: 343100748
Merged-In: I0b4bea1a97004139cc18129eeeab302aa557ca05
Change-Id: Iba46bfc0ab8cfaf0e6cc451327633efaf19567a6