Merge "Snap for 7717915 from 01990004ec2192d7c85bcbfb18f236c60d32828a to androidx-lifecycle-release" into androidx-lifecycle-release