Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue"