[automerger skipped] Merge "Make sure that only the owner can call...

[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027 am: d28527a3 -s ours am: ba72ebb1 -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: Ide65fdc9b64614019c8d0f48fa3c126cc7334d44