Merge "Snap for 8229153 from f1a355d8d023c84461ccfad84d22e7a4bd51bdee to androidx-arch-core-release" into androidx-arch-core-release