aml_mpr_331613010 (9672969,com.google.android.mediaprovider)
Snap for 9156129 from 948b2f5705a95c9df9968f9fb60976de2a79bc73 to mainline-mediaprovider-release

Change-Id: I727de376c665f1c8de834cf90ad5e0255ba5e432