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