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

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

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