aml_mpr_331311080 (9322801,com.google.android.mediaprovider)
Snap for 8570526 from 7b50a545f11ef5e1390fd4e18a0f1e4c0820a231 to mainline-mediaprovider-release

Change-Id: I6f51f9ed5c1202c9d47a6ce728a055f16dffe589