Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main am: 7c18dd5bbd am: 30d6776e1a

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

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