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 am: 62307ad5

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



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