aml_mpr_331011070
Snap for 8839940 from a34afd602ed1ecfce82b35f2773591e199c7628c to mainline-mediaprovider-release

Change-Id: I5ba29a88e37521ab56a43e9b3c3a327c32bd66c5