[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 4b612e4d20 -s ours am: a5fab2b893 -s ours

am skip reason: Merged-In I029d46edde5b61f20241bab46b97d58c5fe71702 with SHA-1 91a4afdb85 is already in history

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

Change-Id: I2ac413ccf9de1770a10f3907fe90b0f1ed0bab17
tree: 469ec430106a621b494f6e412c6c1af6247a427b
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS