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

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

Change-Id: I7f5f399e76d5326b0a548cb881f66ebb0e4b293c