Merge "Allow integers to both have @IntDef and @IntRange constraints"