Merge "Clear the VPN network preference when error happens" into main am: 464fe985d8 am: 10835ce3fb

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

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