[automerger skipped] Merge Android 12L am: ed65c36b61 -s ours am: 5061db1025 -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: Ib5c9442e09eda68f6ebcdb48ed0c1dd6fc212419
tree: 978e933749d445037258ca30904f420d66eed65e
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS