Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550
Merged-In: If8ba846036c42269109717f1b8ca4d70f1a8116c
Change-Id: I9c11804a609c1c8e1880b265d926c5496a0db5f5