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

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

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