Upgrade to 8.3.3

Created using ./update-from-external.sh 8.3.3

m -j32 droid
adb reboot bootloader
fastboot flashall -w
m -j32 cts
cts-tradefed run cts -m CtsTelephonyTestCases -t android.telephony.cts.PhoneNumberUtilsTest
m -j32 libphonenumber-test vogar dx
vogar --timeout 0 \
    --classpath ${ANDROID_BUILD_TOP}/out/target/common/obj/JAVA_LIBRARIES/libphonenumber-test_intermediates/classes.jack \
    com.google.i18n.phonenumbers

Bug: 35935735
Test: As described above
Change-Id: Ibe5d5c4ca3b2c6766598456a4106507c836d78ff

6 files changed, 14 insertions, 11 deletions

diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index d0869e5b..1cfcac38 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -72,9 +72,9 @@ public class PhoneNumberOfflineGeocoder {
       String regionWhereNumberIsValid = "ZZ";
       for (String regionCode : regionCodes) {
         if (phoneUtil.isValidNumberForRegion(number, regionCode)) {
+          // If the number has already been found valid for one region, then we don't know which
+          // region it belongs to so we return nothing.
           if (!regionWhereNumberIsValid.equals("ZZ")) {
-            // If we can't assign the phone number as definitely belonging to only one territory,
-            // then we return nothing.
             return "";
           }
           regionWhereNumberIsValid = regionCode;
@@ -105,7 +105,9 @@ public class PhoneNumberOfflineGeocoder {
    *
    * @param number  a valid phone number for which we want to get a text description
    * @param languageCode  the language code for which the description should be written
-   * @return  a text description for the given language code for the given phone number
+   * @return  a text description for the given language code for the given phone number, or an
+   *     empty string if the number could come from multiple countries, or the country code is
+   *     in fact invalid
    */
   public String getDescriptionForValidNumber(PhoneNumber number, Locale languageCode) {
     String langStr = languageCode.getLanguage();
@@ -153,10 +155,11 @@ public class PhoneNumberOfflineGeocoder {
    * @param number  the phone number for which we want to get a text description
    * @param languageCode  the language code for which the description should be written
    * @param userRegion  the region code for a given user. This region will be omitted from the
-   *     description if the phone number comes from this region. It is a two-letter uppercase ISO
-   *     country code as defined by ISO 3166-1.
-   * @return  a text description for the given language code for the given phone number, or empty
-   *     string if the number passed in is invalid
+   *     description if the phone number comes from this region. It should be a two-letter
+   *     uppercase ISO country code as defined by ISO 3166-1.
+   * @return  a text description for the given language code for the given phone number, or an
+   *     empty string if the number could come from multiple countries, or the country code is
+   *     in fact invalid
    */
   public String getDescriptionForValidNumber(PhoneNumber number, Locale languageCode,
                                              String userRegion) {
@@ -180,7 +183,7 @@ public class PhoneNumberOfflineGeocoder {
    * @param number  the phone number for which we want to get a text description
    * @param languageCode  the language code for which the description should be written
    * @return  a text description for the given language code for the given phone number, or empty
-   *     string if the number passed in is invalid
+   *     string if the number passed in is invalid or could belong to multiple countries
    */
   public String getDescriptionForNumber(PhoneNumber number, Locale languageCode) {
     PhoneNumberType numberType = phoneUtil.getNumberType(number);
@@ -199,10 +202,10 @@ public class PhoneNumberOfflineGeocoder {
    * @param number  the phone number for which we want to get a text description
    * @param languageCode  the language code for which the description should be written
    * @param userRegion  the region code for a given user. This region will be omitted from the
-   *     description if the phone number comes from this region. It is a two-letter uppercase ISO
-   *     country code as defined by ISO 3166-1.
+   *     description if the phone number comes from this region. It should be a two-letter
+   *     uppercase ISO country code as defined by ISO 3166-1.
    * @return  a text description for the given language code for the given phone number, or empty
-   *     string if the number passed in is invalid
+   *     string if the number passed in is invalid or could belong to multiple countries
    */
   public String getDescriptionForNumber(PhoneNumber number, Locale languageCode,
                                         String userRegion) {
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 1b187606..7e142715 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/34_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
index 2af5897e..77a25fc4 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
index c03c3ac6..652bfda2 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/34_es
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
index 1b0e2d77..402e8094 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
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 5ea5c181..5e6ed38b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/91_en