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

Change-Id: Iab3ed64398e2ce55385b218d19ffd24f51d53d2f