Merge "Add owners for VpnManagerService" am: 2984d87873

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

Change-Id: Icb34ffc9305bd7dcf3f2e1fa8f87ece46c3bc168