[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 4b612e4d20 -s ours am: a5fab2b893 -s ours am: 29c3633152 -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: Ic039b8197f1a0591e8308fb787ef52743f17c77d
tree: 67dd4a548e739cf541fd2203a1857dab25a7fc27
  1. .prebuilt_info/
  2. 1/
  3. current/
  4. OWNERS