Snap for 8857176 from c109e661537b1c1f1abe0ac95bc851a8975ed7c3 to mainline-go-mediaprovider-release

Change-Id: I57902ccb0f9ad4562b43090ecd6c969452adbef5