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

Bug: 337098550
Merged-In: Ibe1a49a38a05ecfb623c64fb48c812cc422a54e3
Change-Id: I3781ebcfa0b297aa89420245540d269ebecd613d