Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Ifc5d3f3b43bef256141db089d5783427561e4dae