aml_mpr_330911040
Snap for 8570526 from cbb2e714a2890890991d72b3d8ce86f210c34e5c to mainline-mediaprovider-release

Change-Id: Ia15985dfeab13e88c7c2967153218ea4786ab0b8