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

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

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