Merge "Snap for 9548799 from 28b7dc5d5e03e9b8dea905a635e0588d68ae8e97 to androidx-arch-core-release" into androidx-arch-core-release