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

Bug: 343100748
Merged-In: Ia326f034207889c1443038131214afe3a8b91769
Change-Id: Ie4a87ccc902f78748ab32396d014abe1b1c82ba9