[automerger skipped] Merge SP1A.211205.008 am: 9b38a86cdd am: ab85c730a2 -s ours

am skip reason: Merged-In I497cc8fa38bf0cc7103b5088c08e4f448cf9d928 with SHA-1 9ca03dfdce is already in history

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

Change-Id: I10bd515fa0397a5b312e86e993b81b45856c9a4c
tree: e15991000c90a64a19e13f4a3755501c4d491a02
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS