Add change markers to misc files in java.text.

Add Android-changed annotations where we have local modifications in
ChoiceFormat, MessageFormat and Normalizer.

Also undid some local formatting-only changes in Normalizer to simplify
future patching from upstream.

Bug: 65669355
Test: m (comment-changes only)
Change-Id: Ice94bae52854cb75f99e457ce4fd31d98e6e3ee2
3 files changed