Moved android_packages_providers_MediaProvider upstream