[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: d3a57f42f4 -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: I3e99f887f03dd994e3f149f4d3de2515e833aabb
This commit is contained in: