shill: De-duplicate MTS entry in mobile operator database.

MTS was included in both |additional_providers| and |serviceproviders|. This CL
merges the two entries together.

BUG=chromium:278151
TEST=(1) emerge-falco shill
     (2) Test that MTS name shows up correctly on the MTS network.

Change-Id: Ie17f8efe0667679147c8e14a48aa3f2dfd9ddac9
Reviewed-on: https://chromium-review.googlesource.com/204717
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>

mobile_operator_db/additional_providers.prototxt

diff --git a/mobile_operator_db/additional_providers.prototxt b/mobile_operator_db/additional_providers.prototxt
index b188d9b..d25e73d 100644
--- a/mobile_operator_db/additional_providers.prototxt
+++ b/mobile_operator_db/additional_providers.prototxt
@@ -303,6 +303,7 @@
   data {
     uuid : "d9d788e1-7838-4167-aa96-d0926cb6ebad"
     country : "in"
+    provider_type : CDMA
     localized_name {
       name : "MTS"
     }

mobile_operator_db/serviceproviders.prototxt

diff --git a/mobile_operator_db/serviceproviders.prototxt b/mobile_operator_db/serviceproviders.prototxt
index 4fd8619..022b4bd 100644
--- a/mobile_operator_db/serviceproviders.prototxt
+++ b/mobile_operator_db/serviceproviders.prototxt
@@ -7066,27 +7066,6 @@
 
 mno {
   data {
-    uuid : "ae2c1617-3e59-4d2d-bf6c-ac6cd1ea9a24"
-    country : "in"
-    provider_type : CDMA
-    localized_name {
-      name : "MTS MBlaze"
-    }
-    sid : "14554"
-    sid : "14555"
-    mobile_apn {
-      apn : ""
-      localized_name {
-        name : "MTS MBlaze"
-      }
-      username : "internet@internet.mtsindia.in"
-      password : "mts"
-    }
-  }
-}
-
-mno {
-  data {
     uuid : "a1aba289-0825-43de-90b0-b7b4a9f5cdeb"
     country : "in"
     provider_type : GSM