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