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

Change-Id: Ia802cbca2c56deca80f0383628d053ff37d79db4