[automerger skipped] Merge Android 12 am: 608ea25d4a -s ours am: e328967899 -s ours

am skip reason: Merged-In I1fb6886e1a16a3df9397ef6a4e6dab7bbf838487 with SHA-1 6cdd3f1e1e is already in history

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

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