Merge changes from topic "vpn-impl"

* changes:
  Suppress NewApi warnings for @SystemApi -> public APIs
  Add VpnServiceBuilderShim for VpnService.Builder