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

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

Change-Id: Ic753fc65676446563e6a286d39fe6a3ba8ef2b6e