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

Bug: 343100748
Merged-In: Ie10a5ae0c25aff5ab0621a8f4533ad5e19905252
Change-Id: I8a71a7fced4a95d81746f4d7a1a42932c80d955b