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

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

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

Change-Id: If4f486ff71d52d4cc5c33e4dfc9434a5c5d6d3c0