Merge "Snap for 6790423 from 4335b4b0d7b80bfab334859da8178a67da63b4e5 to androidx-media2-media2-widget-release" into androidx-media2-media2-widget-release