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

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

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