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