Merge "Add IntDef annotation to SIM state constants."