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

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



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