Merge "Fix Settings crashed when WIFI_ADD_NETWORKS" into udc-dev am: 4132d3b5

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



Change-Id: I74cab9f6b5af834e2b57fd17627a0fe1e3fd47df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>