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: Ia2a668f775c6ed578d7573e19a9720afb7afba3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>