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

Bug: 337098550
Merged-In: I39640de1922b2439b8c4bb11cb6f70d5e0e7e218
Change-Id: I9fae8adc36970fdf9a2887fde6b03c04681b90ba