Merge "Snap for 6994331 from 8fb5d4253f1b0eab4820009bfc5a5c8afbfc8681 to androidx-master-release" into androidx-master-release