aml_mpr_341111020 (10992385,com.google.android.mediaprovider)
Snap for 10453563 from bc0abd7c41fdffdad70af974ca5cf6b9019eb066 to mainline-mediaprovider-release

Change-Id: Ia322475f4085e65b746831d1814dbcd120300b47