Merge "Clear the VPN network preference when error happens" into main am:...

Merge "Clear the VPN network preference when error happens" into main am: 464fe985 am: 10835ce3 am: a0d1b340

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



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