Move applying underlying caps from Vpn to ConnectivityService. am: d182c40d8c am: 17199d78a2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1501815

Change-Id: I8f4dc858bf45095102b583f528eac296637132b4