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: Iee0706abd8d45cc0f38f50dce25e7a54ce795060