Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 68bbf71c37 am: 8ea944d77a am: baedafcc46 am: 83189041e9

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

Change-Id: I7c535b32844f00eef3ad2f4454557f92c3d1befc