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

Change-Id: I15b3c1d3aac92cdd25e0ebf2c2aa1eb7d6f42d17