aml_mpr_341111030 (11041414,com.google.android.go.mediaprovider,com.google.android.mediaprovider)
Snap for 10453563 from 3fb352c5e09bffc81c9e3359c217b820b2480de6 to mainline-mediaprovider-release

Change-Id: I692e26e7bed964e5b0f81d5b56ba294465a908e1