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

Bug: 343100748
Merged-In: Ib334629e72c72727e93261df2cf70eee7065bdcb
Change-Id: Ie3294fe49a8d65b0d311d2930cd6b8139ec18167