Merge "Make sure that only the owner can call [stop|start]VpnProfile()" into...

Merge "Make sure that only the owner can call [stop|start]VpnProfile()" into sc-dev am: 8d26ea92 am: 105b17be am: cec824b8 am: 7d66df38

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

Change-Id: I4ec41df47602952db1898e83f597a4232aaa803d