Merge "Verify VPN underlying network is set as soon as it tries to use it" into main am: 69cd0aa5a0 am: 1bda781fc7

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

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