Merge "Make VPN more testable and update NC during network change" am: fdfdf95b

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



Change-Id: I55a519f04508240f056a24e80444a051679ffc4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>