Snap for 9710098 from 4b2f08b8aedab71db1f2cddfe55af5f6c68bc2f3 to mainline-tzdata5-release

Change-Id: Id8eab6d5bc52469c9728f0c0799d2ad53a97373a
diff --git a/android/PhoneNumberUtilsTest.cpp b/android/PhoneNumberUtilsTest.cpp
index 8e4692c..6117fce 100644
--- a/android/PhoneNumberUtilsTest.cpp
+++ b/android/PhoneNumberUtilsTest.cpp
@@ -195,11 +195,12 @@
 }
 
 TEST(PhoneNumberUtils, compareStrict_phone_number_stripped_reversed_inter) {
-    char out[6];
+    char out[7];
     int outlen;
 
 #define ASSERT_STRIPPED_REVERSE(input, expected) \
-    phone_number_stripped_reversed_inter((input), out, sizeof(out), &outlen); \
+    phone_number_stripped_reversed_inter((input), out, sizeof(out)-1, &outlen); \
+    ASSERT_LT(outlen, sizeof(out)); \
     out[outlen] = 0; \
     ASSERT_STREQ((expected), (out)); \