Snap for 8570526 from 3dc30e23e1f24a7cf8862f6fed1166a68ddca94d to mainline-mediaprovider-release

Change-Id: I5bc53231480ccad99b57567ba828951d5d21856e