aml_mpr_331812020
Snap for 8570526 from fa553d18864e482cbdb0579d266ba5efca79ad7a to mainline-mediaprovider-release

Change-Id: I9178945f3a896c85752cd31984e1a66aef30f541