Don't restrict locale handling to two letter locales.

Use Locale.forLanguageTag where appropriate and compare
languages and countries separately.

Note that we do all comparisons on locale objects so that
the same deprecated language code conversions occur.

(cherry picked from commit 37b4053b)

Change-Id: Ia4ae4b1760a023be103feb9ebf0e6be5f6731ff3