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

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

Change-Id: Ia220fb614857b9aa488d5e721936d3e01b897f3c