Merge "Allow device owner to configure preferential network service" into tm-dev am: 47a78f3d

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



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