aml_mpr_331711020
Snap for 9691662 from ec408496521e0cacde1da336aa63041bf424d444 to mainline-mediaprovider-release

Change-Id: I8bcea729179e1abd3a9f7b058ea6442d3cab0f28