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

Bug: 343100748
Merged-In: I2c1785105bab74a483bc68893d96a8a88eabfd90
Change-Id: I92a4a0fcec18e459b899a4da7ed13527197fe64b