Merge "b/22228577: Improve @IntDef annotation to handle special values and ranges"