[automerger skipped] Merge Android 12 am: b41b99a953 -s ours

am skip reason: Merged-In I5818da3f15e2866828847503221a4ae5fcc9bfb5 with SHA-1 a1465b45f1 is already in history

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

Change-Id: I64ca80d138b702e2246fce2b893eb94baac62788
tree: 2a8caae0129c790397339820cc39c42ab64570f4
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS