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

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

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