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

Bug: 343100748
Merged-In: Ib3b9baf24d3f0d5622ae63f11aa564df35fd14df
Change-Id: I83b750e16fe6e611c042ab32cb1577c3ee0e69e8