Merge changes Ib0df2810,Ic8dcb7e5 into main

* changes:
  Refactor tethering utility methods
  Fix NetworkCallback#onAvailable does not match SSID