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

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

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



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