Snap for 10618552 from fa975470806ba46064ab6a91d559fa20071c7137 to mainline-mediaprovider-release

Change-Id: I2ef2b253e345e9486104b99117c9af9f89246e7d