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