Merge "Add owners for VpnManagerService" am: 2984d87873 am: 79bb916144 am: eebc8afb52

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

Change-Id: I8d7df112b875b3eadf6dea4cf23d68f46fa2bbd5