aml_mpr_331613010 (9672969,com.google.android.mediaprovider)
Snap for 9129914 from 3f5a9b1124f9207397e11e9ade4d9a6b3c2acc42 to mainline-mediaprovider-release

Change-Id: I7b4f06441cd2a1c061807dda764d56dcc5dbec78