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

Bug: 337098550
Merged-In: I89987caa85e6bea31abde42579cb21991b14373b
Change-Id: Iaee3cff2bda14ffcd0158f8f81eecfc55f2eafcf
tree: 00b36f1fcdcdd73a67f33150dac1fbeb7451ec9e
  1. plugins/
  2. Android.bp