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

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

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



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