Merge "Remove ip-up-vpn" into main am: cb11102c6e am: 61e12fc315 am: 8d877e2127

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2862611

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