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

Bug: 343100748
Merged-In: I9ce27a764a09b8d878d4d14ed956205000355610
Change-Id: Ie052fcfb128711cdeed0083e52b40c8c53f4f805