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

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



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