Merge "Revert "Make VPN more testable and update NC during network change""...

Merge "Revert "Make VPN more testable and update NC during network change"" am: a625dad3 am: e1592a84 am: 97fe50f1 am: a525c2d9 am: c0db64b7

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



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