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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/11428556

Change-Id: Ic321f026f7e3a27de51268a0bb19516c779235dd