Merge "Merge "Store preferential network service config in xml" into tm-dev am: 6d8f2732 am: 80b8651a am: 5bb95d6c" into tm-qpr-dev-plus-aosp