Merge "Fixes for null WifiManager." into rvc-dev-plus-aosp am: 7e2e20538e am: db81290280

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11336055

Change-Id: I3741e79d80184e0f648211dd46bfac72198bbf9d