Merge "Fix comparison of SIM State values." into rvc-dev am: d1a7263e8e am: 6d43dccd2b

Change-Id: I50c019b5e2a2690327c30f0d34dfdfbf469196f5