Snap for 7468467 from ca815c709ef8029c6f26d4f59900e5396633867e to mainline-mediaprovider-release

Change-Id: I92b595859b7de13946c0ee8839310923908cd31c