Merge "Reset VPN settings by calling VpnManager." am: be4a0e84ef am: 9e072f09a0

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1594351

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09ebb58281e60c246550426b2b962a4dce6b72ad