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