[automerger skipped] Merge SP2A.220305.012 am: b2a44a3dca -s ours

am skip reason: Merged-In I0cfc25feaa946e0710fe87df7a1b587c61ca6dd4 with SHA-1 72e6b9e5fe is already in history

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

Change-Id: I31eec5db797c7548033b4976509b333e337a9a13
tree: 0177281194c8619b8654f6832524588b52e6d2ba
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS