aml_mpr_331011070
Snap for 8570526 from 61fbdb4506a7772a21c6f29568fae33fbc63b24b to mainline-mediaprovider-release

Change-Id: I7ae09976b3954ce84f791e24b64acbfb51e2aac7