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

Change-Id: I17165329675ff0a4ab16cd04dcfc09316d554577