Merge changes I3b6ee1db,I70e13303,I6fb7dfe4 into main

* changes:
  Simplify addRoutesToLocalNetwork calls
  Add LocalNetworkConfig
  Tell netd about local networks