Merge "Merge cherrypicks of ['android-review.googlesource.com/2482447'] into androidx-lifecycle-release." into androidx-lifecycle-release