Merge "Handle lockdown VPN reset intent in ConnectivityService" am: fc6fbde5df am: 8ea944d77a am: 1183f4a548 am: 7e62609e37 am: 3d1a6b7ced

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

Change-Id: I5214ad4d738af47bc19f605ae24e6eb9e363012e