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

Change-Id: I1754f951b13ff32348ec3c863ca6763f6934015c