Merge "Allow device owner to configure preferential network service" into tm-dev