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

Bug: 337098550
Merged-In: Iba5169f65fbba4b90e6767caebf1d0c96f299a63
Change-Id: Idcb8b8add99a3962ecd2fd6bdd5ac0fe5bc8f74d