aml_mpr_331711020
Snap for 9691662 from 64374c4dd32588f838404a25d214d8b7ed4f2575 to mainline-mediaprovider-release

Change-Id: Ia9080a2b46bbe03d99e310f30790320360169110