Merge "Have NetworkMonitor validate VPNs that request it." am: f4947afd54 am: 81f97cecc7

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

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