Merge "Add tests for VPN validation in NetworkMonitor" am: 59e6e2b730 am: 9b5703d71c am: 476aa853f0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976726

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