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

Merge "Merge "Allow device owner to configure preferential network service" into tm-dev am: 5d4978d3 am: f8e7ebb7" into tm-d1-dev-plus-aosp am: d6280d74 am: a888426f

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



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