Snap for 10453563 from 0146411f7d7d31c4dc8321fd2626f8a7fb905f25 to mainline-mediaprovider-release

Change-Id: Ieb63176e63ad8ec36f8ad7bcb98d49d10b03033e