Merge "Add checks around CONTROL_VPN permission during prepare()" am: 04f3dc871d

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2624812

Change-Id: Ibf49d8f7bf4912a8192838c3bf2692585b0d1135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>