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

Change-Id: If205a1cf298891bb98c420c29fc11e2275c0719a