Merge "Allow device owner to configure preferential network service" into...

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

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



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