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

Change-Id: I77f9d1a9f0e60cf45602fc6e92d3d7257eed3eb6