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

Bug: 343100748
Merged-In: I3a91fa581e5b3509d21a86200243e2d51c8b0953
Change-Id: I891eeec4b9a88c6e9119cc960b59e9fa40069e21