Merge "Add IntDef annotation to SIM state constants." am: 7339d1743c am: 6ad53af775

Change-Id: I5420117382f9a3e487fc26b56eecde199ba704a2