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

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