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

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

Change-Id: I4eb9d53d1136ba6e4b9e1fdb884e0920567db2f7
tree: 557625460e4c5184597eb7ad9d104b5340c0444d
  1. core/
  2. services/
  3. tests/