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