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

Change-Id: Ia1359f5e93fef953cb3cc29154c5c6677384e02b