Merge "Fix comparison of SIM State values." am: 8ac9a7274a

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

Change-Id: I89be8bf77630f9bf5b6741a32d421e85f8db65a5