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

Bug: 343100748
Merged-In: If12d978ee69ee7f087a7e8758513a9c6bacf817f
Change-Id: I65adc22bdfae4793d763db08e65b8a89128c3ce4