Merge "Snap for 15498601 from 2caf66bf91a73ee60c8f31f5bfa1fc26749db886 to androidx-lifecycle-release" into androidx-lifecycle-release