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

Bug: 337098550
Merged-In: Ie9cb62e9b71ce574c5d69c9462f98244b8e0e3ef
Change-Id: Id9ea7e43942e9ffd0561385639d3a764363c595b
tree: dfe521bd71b96dbb05e9fbd03225d8969a2470f8
  1. current/
  2. OWNERS