Merge changes from topic "cherrypicker-L21100000961067008:N34400001375316978" into udc-dev

* changes:
  Use netd socketDestroy for VPN in T-
  Revert ConnectivityServiceDependencies access modifier