Upgrade to 8.7.1

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

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: 36705773
Test: as above
Change-Id: I07781a60d9052347968ea734226e43a5dac5f837

20 files changed, 2 insertions, 2 deletions

diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
index 1cfcac38..a48ed903 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java
@@ -156,7 +156,7 @@ public class PhoneNumberOfflineGeocoder {
    * @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 should be a two-letter
-   *     uppercase ISO country code as defined by ISO 3166-1.
+   *     upper-case CLDR region code.
    * @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
@@ -203,7 +203,7 @@ public class PhoneNumberOfflineGeocoder {
    * @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 should be a two-letter
-   *     uppercase ISO country code as defined by ISO 3166-1.
+   *     upper-case CLDR region code.
    * @return  a text description for the given language code for the given phone number, or empty
    *     string if the number passed in is invalid or could belong to multiple countries
    */
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1332_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1332_en
new file mode 100644
index 00000000..5208d75c
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1332_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1564_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1564_en
new file mode 100644
index 00000000..8b500022
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1564_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
index 06efda86..38cd893b 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/223_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
index 726d581a..fde91395 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/233_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en
index 624068ff..362735d5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
index c8caa9e5..92607e38 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
index 0c64f988..48a65092 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
index 74fa2da8..3c475656 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_sv
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
new file mode 100644
index 00000000..14730e8e
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/52_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/675_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/675_en
index dba8ddb0..2a0ec3d2 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/675_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/675_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi
index 1fbe4064..4b491fd5 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_hi
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw
index 715f8f05..e6f46130 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_iw
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr
index 3fe43841..f47b09cb 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/82_tr
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 af9ea549..827f9938 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/84_vi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/84_vi
index 402e8094..49f5795f 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/95_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en
index e69778c6..a8e851ad 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/95_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/976_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/976_en
new file mode 100644
index 00000000..01d58b68
--- /dev/null
+++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/976_en
diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config
index 52d7f86a..979d20fa 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 32b741e8..44a27738 100644
--- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data
+++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data