Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9

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

Change-Id: Idcbfb1ad94c2b5ab262431277c1e639517c6de47