DO NOT MERGE - Empty merge to indicate SP1A.210812.001 is already merged am: 6240f4dab3 am: f9560c12e6

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

Change-Id: Ia4958a2e7d55193e7aa0355eeb221b607c86dbe0