Snap for 9392927 from 325263a2868c39a022d714c31e46e1ea63a08bd5 to mainline-mediaprovider-release

Change-Id: I36cc7dad0e25b6e7096768513261fe44babbf1de