Snap for 8570526 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-mediaprovider-release

Change-Id: Ic7c844dc4acc5e5dd04261f88fde46071b043061