Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release

Change-Id: Ib77eeb0ef00aa3573d37c227ffa713249c4fbbad
diff --git a/assets/carrier_list.pb b/assets/carrier_list.pb
index fea02b5..856c5bc 100644
--- a/assets/carrier_list.pb
+++ b/assets/carrier_list.pb
Binary files differ
diff --git a/assets/carrier_list.textpb b/assets/carrier_list.textpb
index a4ca8c8..23196a5 100644
--- a/assets/carrier_list.textpb
+++ b/assets/carrier_list.textpb
@@ -1944,12 +1944,15 @@
   canonical_id: 1187
   carrier_name: "AT&T"
   carrier_attribute {
+    mccmnc_tuple: "310030"
     mccmnc_tuple: "310070"
     mccmnc_tuple: "310170"
+    mccmnc_tuple: "310280"
     mccmnc_tuple: "310380"
     mccmnc_tuple: "310410"
     mccmnc_tuple: "310560"
     mccmnc_tuple: "310680"
+    mccmnc_tuple: "310950"
     mccmnc_tuple: "311180"
   }
 }
@@ -2040,13 +2043,6 @@
   }
 }
 carrier_id {
-  canonical_id: 1233
-  carrier_name: "Texas RSA 1 dba XIT Cellular"
-  carrier_attribute {
-    mccmnc_tuple: "310950"
-  }
-}
-carrier_id {
   canonical_id: 1234
   carrier_name: "UBET Wireless"
   carrier_attribute {
@@ -5410,13 +5406,6 @@
   }
 }
 carrier_id {
-  canonical_id: 1782
-  carrier_name: "Centennial Communications"
-  carrier_attribute {
-    mccmnc_tuple: "310030"
-  }
-}
-carrier_id {
   canonical_id: 1783
   carrier_name: "Nevada Wireless LLC"
   carrier_attribute {
@@ -5481,13 +5470,6 @@
   }
 }
 carrier_id {
-  canonical_id: 1794
-  carrier_name: "Contennial Puerto Rio License Corp."
-  carrier_attribute {
-    mccmnc_tuple: "310280"
-  }
-}
-carrier_id {
   canonical_id: 1795
   carrier_name: "Nep Cellcorp Inc."
   carrier_attribute {
@@ -7821,4 +7803,4 @@
     gid1: "508"
   }
 }
-version: 2
+version: 4