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

[automerger skipped] Perform VPN data stall recovery on unvalidated VPN network am: 371c0a82 -s ours am: 98c1c2f4 -s ours am: c1e4ecde -s ours

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

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



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