Snap for 9698047 from 2b610b619ca83500547083d720a72e903ee455ae to mainline-mediaprovider-release

Change-Id: I5e68d9c9f873297365cf25049d28d140e5872b21