Merge "Snap for 8059228 from aeeec1d053940437b315a8e727f57b0f6e6e5076 to androidx-media-release" into androidx-media-release