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

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



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