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

Merge "Make VPN more testable and update NC during network change" am: fdfdf95b am: fecdd252 am: a5f12152 am: 08d33fd7 am: c17d9daf

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



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