Snap for 10453563 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-mediaprovider-release Change-Id: I4cd3554dacf635039e8d1c1ceb9ec469dee5b65b