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

Bug: 337098550
Merged-In: I64be5e3f3750f5013516996f198aaa6648892035
Change-Id: I9b167eb25bc8a0339d5d5356c0f732410734b6f6
tree: e18891a5ee407ee44b40fb5b8a321c317fcf7b43
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS