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 am: 1c0410e1 am: dd2e732e

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



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