Merge tm-dev-plus-aosp-without-vendor@8763363

Bug: 236760014
Merged-In: I08664a55a4d56769636ca099d82750db4ea57de9
Change-Id: I16f8c9c1d45f5d1c75680c319b49240a09834d78
tree: 24ce725e4e7d3d9cccf2df15100cb13f9ca012dd
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS