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

Change-Id: Ic4ce0ddc1d9d5732b339efbb728249d7811ce3be