Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main am: 7c18dd5bbd am: 73bfbdf008

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2825770

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