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

Change-Id: Ifbba178278a9fa2225836a7c237bb913b8d9032a