Snap for 8570526 from 7b581886d1830f50c3ab104a56b7ab931779466f to mainline-mediaprovider-release

Change-Id: I4ea622f6cab307d41aa619149186230d64568e63