tree bd142d4237fee796ab3fc2aa73202e4fe18b7a7c
parent dc2cb767031fea9a38d8f9c37f951162230efbd9
parent faa9ddc9a34e6e268ce78c756249bfbea53336bf
author Lucas Lin <lucaslin@google.com> 1629001645 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629001645 +0000

[automerger skipped] Merge "Make sure that only the owner can call stopVpnProfile()" into rvc-dev am: 15941027a9 am: c940a77495 -s ours am: 0d88bdece9 -s ours am: 778117f023 -s ours am: faa9ddc9a3 -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: I98289f6d61126827bffcd22c817875fe02ef656e