aml_mpr_331112050 (9323206,com.google.android.mediaprovider)
Merge stage-aosp-master into pi-dev-plus-aosp
am: 581d8d1ed9

Change-Id: I090da70aaf2e49d5b5f15367692c0a7c1b1addef