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

Merge "Implement an API to block non-enterprise networks" am: 8c289784 am: 98124521 am: d322aa01

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



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