Merge "DO NOT MERGE Apply upstream changes of TestUnicodeExtension [U]" into android14-dev