[automerger skipped] Merge Android 12L am: ed65c36b61 -s ours am: 5061db1025 -s ours am: c3c6910cc1 -s ours

am skip reason: Merged-In If11cffc2b37f0868ff178d95a9f946700cb59ba0 with SHA-1 610787d703 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/Media/+/2013427

Change-Id: I4691edfad74e844dfda3af8f37d57632db801bbc
tree: baefc686614e3d988424eaf966f2449402d2a089
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS