Merge Android R

Bug: 168057903
Merged-In: Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a
Change-Id: I469b04b384b08d932931b74fdc929f7603eb6fcb
tree: f7511c08fd7a0f5ed2dc2dd3e2b3f0170950a915
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS