[automerger skipped] Merge "Perform VPN data stall recovery on unvalidated VPN...

[automerger skipped] Merge "Perform VPN data stall recovery on unvalidated VPN network" into udc-d1-dev am: 65f865f8 am: eb12fe01 -s ours

am skip reason: Merged-In Ibb8197a689220db5868f351bffa9ac27334355e2 with SHA-1 371c0a82 is already in history

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



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