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

Bug: 337098550
Merged-In: Iaa744f1834b45dff46ac79fb6ce8b6f8cfe883f0
Change-Id: I2cc9c5b1bf5bbea9786674e2f289f5b5f1c81e27