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: 80b8651a am: 5bb95d6c" into tm-qpr-dev-plus-aosp am: 603f1c7a

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



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