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

* changes:
  Revert "Unhide RouteInfo#getType and related fields"
  Revert "Unhide IpPrefix(InetAddress, int)"
  Revert "Add CTS tests for exclude VPN routes APIs"