Merge "Snap for 9512875 from 8f6cec6ca74bbbaf4a728f9965f124ff5b87f08f to androidx-arch-core-release" into androidx-arch-core-release