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

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

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