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

Bug: 337098550
Merged-In: Ibe81afccf3f47fe07a9ee88be851abc3245ffa35
Change-Id: I787fbc096eea4035444946ea59dbf808aa28da25