Upgrade to libphonenumber-7.7.0 which is nano proto free

Bug: 31608797
Test: Rebuilt and ran android.telephony.cts.PhoneNumberUtilsTest
Change-Id: Ia5beb5c0ff189577c3eb76cc4f2c4e5d243ae97d

46 files changed, 2 insertions, 13 deletions

diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index 5642a11d..f4dc6aad 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -186,7 +186,7 @@ public class PhoneNumberOfflineGeocoder {
     PhoneNumberType numberType = phoneUtil.getNumberType(number);
     if (numberType == PhoneNumberType.UNKNOWN) {
       return "";
-    } else if (!canBeGeocoded(numberType)) {
+    } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) {
       return getCountryNameForNumber(number, languageCode);
     }
     return getDescriptionForValidNumber(number, languageCode);
@@ -209,20 +209,9 @@ public class PhoneNumberOfflineGeocoder {
     PhoneNumberType numberType = phoneUtil.getNumberType(number);
     if (numberType == PhoneNumberType.UNKNOWN) {
       return "";
-    } else if (!canBeGeocoded(numberType)) {
+    } else if (!phoneUtil.isNumberGeographical(numberType, number.getCountryCode())) {
       return getCountryNameForNumber(number, languageCode);
     }
     return getDescriptionForValidNumber(number, languageCode, userRegion);
   }
-
-  /**
-   * A similar method is implemented as PhoneNumberUtil.isNumberGeographical, which performs a
-   * stricter check, as it determines if a number has a geographical association. Also, if new
-   * phone number types were added, we should check if this other method should be updated too.
-   */
-  private boolean canBeGeocoded(PhoneNumberType numberType) {
-    return (numberType == PhoneNumberType.FIXED_LINE ||
-            numberType == PhoneNumberType.MOBILE ||
-            numberType == PhoneNumberType.FIXED_LINE_OR_MOBILE);
-  }
 }
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en
new file mode 100644
index 00000000..cf1636a3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1548_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en
new file mode 100644
index 00000000..29a919a9
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1743_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en
new file mode 100644
index 00000000..24bb0114
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1747_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en
new file mode 100644
index 00000000..0856e342
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1934_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
index fa71451d..2ae8176b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/212_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
new file mode 100644
index 00000000..06efda86
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
index e389d1c3..6da6432d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/251_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
index 3b413f6e..1b187606 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/254_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
index 39d41a0a..b99be333 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/27_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en
index 5273f0e7..5ad7e32d 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/371_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
index 3a2d306a..2dd3e791 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/44_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en
new file mode 100644
index 00000000..dbf547da
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/501_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
new file mode 100644
index 00000000..24aedf80
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/504_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
index 61697eb3..054d2132 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
new file mode 100644
index 00000000..6e927ccd
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/55_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg
new file mode 100644
index 00000000..0f3c055a
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_bg
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca
new file mode 100644
index 00000000..243c0a23
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ca
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el
new file mode 100644
index 00000000..48d7608f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_el
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es
new file mode 100644
index 00000000..3d8653aa
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi
new file mode 100644
index 00000000..b7348e92
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_fi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi
new file mode 100644
index 00000000..1fbe4064
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu
new file mode 100644
index 00000000..96ca9943
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hu
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw
new file mode 100644
index 00000000..715f8f05
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja
new file mode 100644
index 00000000..d559b043
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ja
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl
new file mode 100644
index 00000000..440ff0e3
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pl
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt
new file mode 100644
index 00000000..c89b1b40
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_pt
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro
new file mode 100644
index 00000000..82606acb
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ro
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru
new file mode 100644
index 00000000..e94b0d76
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_ru
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl
new file mode 100644
index 00000000..e083afe2
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sl
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr
new file mode 100644
index 00000000..ae96047f
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_sr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr
new file mode 100644
index 00000000..3fe43841
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk
new file mode 100644
index 00000000..7f1676af
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_uk
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi
new file mode 100644
index 00000000..0221acdf
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_vi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
index 52217295..28501b90 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
index ec13539e..ca85eca2 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
index 6519ec58..84f72fa0 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
index 0b87cd9d..06551ca1 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en
new file mode 100644
index 00000000..3c179c71
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa
new file mode 100644
index 00000000..19c76fd4
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/93_fa
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
index e6995f46..2d8f8f75 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
index 00da41f7..19206f80 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/98_fa
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en
new file mode 100644
index 00000000..7bdce26e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/992_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
new file mode 100644
index 00000000..69468e9e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/994_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 591c591b..7b3822ce 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
index f8a5045c..08d7a6d2 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data