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

Bug: 337098550
Merged-In: I6f18c2be0206a0ad0b6cc00a0ca023cd29a433ec
Change-Id: Ibd7d0fe1fd2fcf5160bbb1d3b2f6e380588aaa46