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

Bug: 343100748
Merged-In: I20b3d485a00109060a6ed206503aa3c12c812969
Change-Id: Ibbed3bbb7e2dbf06614ed1f86a628e4377bacec5