am 6dc0ed72: Merge "Add a unit test to demonstrate ICU CharsetProvider problems"

* commit '6dc0ed7247a7520bf14a89db9b4bc3015d3cdcb2':
  Add a unit test to demonstrate ICU CharsetProvider problems