aml_mpr_351113100 (12872438,com.google.android.go.mediaprovider,com.google.android.mediaprovider)
Snap for 12469265 from 4c8396b814ed3509107e52cbfa3011ff057d78c3 to mainline-mediaprovider-release

Change-Id: I53413438f007199721a67730ddbfa41b2bf648f5