Merge changes I60ed5465,I70b49d0a into mainline-prod

* changes:
  Make the IP subnet persistent till reboot
  Make PrivateAddressCoordinator ignore vpn network
tree: f9ff60d2f1aac30f3456707de185ff596705ecc6
  1. Tethering/