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

Bug: 337098550
Merged-In: I93b4ff41c564236001648abc7c3dfb07d6ae2424
Change-Id: I09bad11f771436cff15e6ea9fa12b7881801bbfb