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

Change-Id: I10bbf77ba8b61bef4c1cde11004e220d65c059eb