Merge changes from topic "revert-1551943-vpn-impl-FKOLCXTDDT"

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