Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4
am: 78ddf4048b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462 Change-Id: I0076ca23acc20568119a47663cdbb1fbb68c52dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: