Merge "Perform VPN data stall recovery on unvalidated VPN network" into udc-d1-dev am: 65f865f8

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



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