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

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

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