Merge "Revert "Allow device owner to configure preferential network service""...

Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev am: b1e20609 am: 0df05f5e

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



Change-Id: I12cfdc60e9c669d7bab6a85ce1b80bb84901546d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>