Merge tm-qpr-dev-plus-aosp-without-vendor@9129937

Bug: 248070379
Merged-In: I08664a55a4d56769636ca099d82750db4ea57de9
Change-Id: I382b208cfe3d6bd8b7d584fb884dc5f3f6e55769
tree: 886f761919f0e077eefd25bd01ba79da6ab38372
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS