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: 094bcc6a

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



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