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

Change-Id: I02f41c3f59b2b15dbdb40b44e653220f2eff6dd3