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