Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future Bug: 343100748 Merged-In: I7f6315c5b4ed6e7338e4a4afeefe8e032b1853c7 Change-Id: I74524d38ab9d96b3eb150b1f0deaf18294e44290