[automerger skipped] Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3 am: 34f35aff90 -s ours
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 09dc253a47 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12468773
Change-Id: I2930152e7fd14e6b5dcb10add5074c8aa69024c6
This commit is contained in: