[automerger skipped] Merge "Add IntDef annotation to SIM state constants." am: 7339d1743c am: 6ad53af775 am: aa4870096c -s ours
am skip reason: Change-Id Ife159922b8b0fdf84ea376f32ac1d9156c9802d3 with SHA-1 c9129642ad is in history

Change-Id: I640cf0dc9c7a6f5bcc7f9690b5b328ddf3936b6f