Merge "Snap for 7167098 from 3da604b8524188eb6965fc43d22d6b4bfd7bd6b3 to androidx-media-release" into androidx-media-release