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

Change-Id: I0bc63b5157620c95a8e3367efb1681dd699630d8