Merge "DO NOT MERGE Apply upstream changes of TestUnicodeExtension. [T]" into android13-dev