Merge "Snap for 9512875 from 5cc4a325cc7e446b3dc9d7f82c2cb132db3293c8 to androidx-arch-core-release" into androidx-arch-core-release