Merge "Store preferential network service config in xml" into tm-dev am: 6d8f2732

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



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