Merge "Use LocaleUtils#filterByLanguage for non-keyboard subtypes." into nyc-dev
am: fc1713dfad

* commit 'fc1713dfadecf089e88cecc765e99a460b7f4513':
  Use LocaleUtils#filterByLanguage for non-keyboard subtypes.