Merge "Cherry-pick: Switch from ICU deprecated unorm_normalize to unorm2_normalize." am: 776a18aff2 am: 23040ff2d2
am: a64371fec4

Change-Id: Iddaa8212e512f992f57347f990a36caf57b064d1