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

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

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



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