aml_mpr_331112050 (9323206,com.google.android.mediaprovider)
Snap for 8728701 from 9d9f699a8ee8d423c353b4eed9bd0ab968bd62f7 to mainline-mediaprovider-release

Change-Id: I4a1f0a5fdd048db4e1618dcca5b488ed81fc468f