aml_mpr_341313030 (11177391,com.google.android.mediaprovider)
Snap for 11053320 from 3d0d0ba034515b40793542069a81d10c7426c797 to mainline-mediaprovider-release

Change-Id: If66f3507f9cbee8cfe36fb708c0ab5388444f4f5