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

Bug: 337098550
Merged-In: Iea685a239486b80f0bdaa232b3410ff5677d9de5
Change-Id: Iff4b5ae1c46c3feeb2015db5b8b5dcf300cac40e