aml_mpr_341015030 (10991675,com.google.android.mediaprovider)
Snap for 10453563 from 2e3a06d0c56edfe9b807ea64d06b05e0a7c61e50 to mainline-mediaprovider-release

Change-Id: I229477cc1fd64c4a1f2f84900cc1125d1445adec