Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df

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

Change-Id: I19ffa2e0d367fecd0859e30c698612f3bdef99e4