Merge changes from topic "am-48bff212a8244c8c8b8a2eb3fb49e523" into main

* changes:
  [automerger skipped] Merge "DO NOT MERGE Apply upstream changes of TestUnicodeExtension [U CTS]" into android14-tests-dev am: a218e5e5c1 -s ours
  [automerger skipped] DO NOT MERGE Apply upstream changes of TestUnicodeExtension [U CTS] am: 235e3b3705 -s ours