Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d...

Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d am: ee773103 am: cd486c06

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



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