Merge "Add @Nullable/@NonNull to WifiManager APIs"