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

Change-Id: I5fd7b3fd9c092365ae320b9935ea873077afc83a