Merge "Set underlying network as soon as VPN tries using the network" into...

Merge "Set underlying network as soon as VPN tries using the network" into main am: 0b3c59e3 am: 87fa06b4 am: 06c1c3ed am: cedc246e am: 76226beb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2719273



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