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

Change-Id: I187b6b84e032e8a04da1cc45d8e279e5a28ede04