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

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

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