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

Bug: 337098550
Merged-In: I63316d2d5a5cc35a844f7f282ac0bf76b9b557fa
Change-Id: I9e2de847e1d9f4c1ee5b7637dec1f0d7c3c6b81b