[automerger skipped] Merge "Fix NullPointerException,...

[automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d2 am: e73b25e3 am: 42710f06 am: 07536baa -s ours am: 8b498d23 -s ours

am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5 is in history

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

Change-Id: If8a740ff1190738501a6cfccf307edb19952d4b1