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

Bug: 337098550
Merged-In: I102674aa519cf562aa8d0b852ebb8067748894a6
Change-Id: I7d4c5e5a30eb6b63834adfaee83d44c8836c66f4