aml_mpr_340919000 (10514023,com.google.android.mediaprovider)
Snap for 10453563 from 6da0a168fc335cc0988dfbc47f9a003815692678 to mainline-mediaprovider-release

Change-Id: I42544425fc8d49ede2499bee16a910c37872c0bb