[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: d28527a3fe -s ours am: ba72ebb1ea -s ours

am skip reason: Merged-In I254ffd1c08ec058d594b4ea55cbae5505f8497cc with SHA-1 007a886baf is already in history

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

Change-Id: Ib557d9a3ae150dcba3cce9aa88f4cb891fc798be