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

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

Change-Id: I65218978d2028e2a918f4a16580ef073492dbb46