Snap for 8433130 from 2cbebc5b6a2e6211fe81a13dd25046bd214d7377 to mainline-mediaprovider-release

Change-Id: I63b132b6e39385dc5d07462e5873fb620f2ad0f7