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

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



Change-Id: I518e54b46da73f5c72c5b8aa297753e103c15b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>