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

Bug: 337098550
Merged-In: I0b3f78e39ed4ea60806f9801202fd71acc880431
Change-Id: I4711bf51424be4d809d52d669db76085608bdecd