[automerger skipped] Merge Android R am: 8db3722fae -s ours am: 353bff4fbb -s ours am: 12b8fada9f -s ours am: deb24443c5 -s ours

am skip reason: Change-Id Ic45ea389825f0d8dd5480ff6845d940c9ec55a0a with SHA-1 9370cdfe57 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/av/+/1421762

Change-Id: I8e2570df708a7099f28442495499cb85b5a216cf
tree: f7511c08fd7a0f5ed2dc2dd3e2b3f0170950a915
  1. hooks/
  2. media/
  3. Android.bp
  4. METADATA
  5. OWNERS