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

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

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