Merge "Snap for 9548799 from 8378f768da78605c1f76697658aaf8a4724678c0 to androidx-arch-core-release" into androidx-arch-core-release