Snap for 7080740 from d1b1cb1817eefd18b97ffee9afce2f51c0fccfa1 to mainline-mediaprovider-release

Change-Id: Ie3574f489c523c62af2bb461c477d2f5b1e643ee