Merge "Implement an API to block non-enterprise networks" am: 8c2897844b am: 9812452186

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

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