Merge "[Feature][T8TSK-298][WIFI]wifi hwnat diff between 2 core and 4 core" into GSW3.0-No-Connman