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

Bug: 337098550
Merged-In: Ie439b2d661617f10bbc31afada187a313dd52af7
Change-Id: I1533cd446131a7c0fb6d9277f5c7fd9b8a2de88c