Merge "Merge cherrypicks of [980242, 980243, 980096] into androidx-room-release" into androidx-room-release