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

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

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