am 67831d38: Merge "Pass BCP-47 tags and not Locale.toString results to ICU."

* commit '67831d38a1c4ea5419f3c61bf4cbcef3704a96d9':
  Pass BCP-47 tags and not Locale.toString results to ICU.