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

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

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