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

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



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