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

Bug: 343100748
Merged-In: I26f0ed9e921beac762f3f9e6aaceb1002ad4801a
Change-Id: Ib58ffbc33000d37eb9066354f217c95ca56091ac