Merge "Remove a use of String16::remove." am: 0529640cc0 am: c881ac71b5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704170

Change-Id: I6817cbc45faabde688d59f4cd36260cea231a1c5

tools/aapt/pseudolocalize.cpp

@@ -194,7 +194,8 @@ static String16 pseudo_generate_expansion(const unsigned int length) {
             break;
           }
         }
-        result.remove(length + ext, 0);
+        // Just keep the first length + ext characters
+        result = String16(result, length + ext);
     }
     return result;
 }