aml_mpr_331613010 (9672969,com.google.android.mediaprovider)
Snap for 9156129 from b4a8c46c7d1167ce556e5bd09a313bf315807210 to mainline-mediaprovider-release

Change-Id: Ifa98f53a187c6b20cb925507a9cc8da63b3d3569