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

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



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