Merge "Snap for 5566084 from 6a350585e0c0010bd01d54683fd6fbd80cc83ec8 to androidx-master-release" into androidx-master-release