Upgrade to 8.9.3

Created using ./update-from-external.sh 8.9.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.jar \
        com.google.i18n.phonenumbers

Bug: 73516753
Test: see above

Change-Id: I55730db3c01f532e7be5736b5bccd520259e3fec
diff --git a/build.xml b/build.xml
index f70d694..aae3fa9 100644
--- a/build.xml
+++ b/build.xml
@@ -171,6 +171,15 @@
       <arg value="-jar" />
       <arg value="${build.tools.jar}"/>
       <arg value="BuildMetadataJsonFromXml"/>
+      <arg value="${resources.dir}/ShortNumberMetadata.xml"/>
+      <arg value="${javascript.dir}/i18n/phonenumbers/shortnumbermetadata.js"/>
+      <arg value="false"/> <!-- Lite metadata. -->
+      <arg value="i18n.phonenumbers.shortnumbermetadata" /> <!-- namespace to provide -->
+    </exec>
+    <exec executable="java">
+      <arg value="-jar" />
+      <arg value="${build.tools.jar}"/>
+      <arg value="BuildMetadataJsonFromXml"/>
       <arg value="${resources.dir}/PhoneNumberMetadataForTesting.xml"/>
       <arg value="${javascript.dir}/i18n/phonenumbers/metadatafortesting.js"/>
     </exec>