tree 08286f720bb34c2a377c41b89740999f2d910149
parent e620a4d41c0c5505d3c9c434628d0f80ea5e340a
parent d3289c0e8beba46b107c10543430b51f474090b5
author Xin Li <delphij@google.com> 1629229562 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229562 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3de62ff835 -s ours am: d3289c0e8b -s ours

am skip reason: Merged-In Ia58475264d5af540334288c0bca0325667d8a525 with SHA-1 fe3f751979 is already in history

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

Change-Id: I1837571fcdeead014802f3309c5292c0f98f1044