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

Bug: 343100748
Merged-In: Ic3d490422ea7973a21a59b5363232f8b8c06f872
Change-Id: I684660ce44e8a71706c915543c69c21481829699