Merge "Revert "Allow device owner to configure preferential network service"" into tm-dev am: b1e20609 am: 51b2862a am: 966dfc29

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



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