Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: Ic35b120bdf5470863b2f5112259280ba051a27c5