Snap for 9129914 from 12cbcd4b908e8d34431e9aebf0fc36e4457bb6a1 to mainline-mediaprovider-release

Change-Id: I49b8f434d107e0537afd857bee1794cb659da020