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

Bug: 337098550
Merged-In: I9913d857b2c1a5888543ed8f1197a6d653fc75c9
Change-Id: I71e3375eba1242147e9373f90705b42c51619b9e