Merge "Fixes for null WifiManager." into rvc-dev-plus-aosp