Merge changes I623e2983,I8b95e020

* changes:
  Fix comments from aosp/1455975
  Manage VPN legacy state separately from NetworkInfo