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

Bug: 343100748
Merged-In: I249a1ba5bb1544c61af914c50d60172a0fffb416
Change-Id: I0e1d083f12bef6da5586dcda653aeffbaad76ea6