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

Bug: 337098550
Merged-In: I379a5080ddf06cc4fa5a3b782ec6ef10a8dd92f0
Change-Id: I45f62014c609c6ffd6ce27e7cec0ca6ea231664d