aml_mpr_340919000 (10514023,com.google.android.mediaprovider)
Snap for 10453563 from 29db264f27140fd954fb6b37c51da411c840610a to mainline-mediaprovider-release

Change-Id: I295a6016010d9f860634920d135c475e21630e1b