AI 146502: am: CL 145995 am: CL 145993 Fix Phone-oriented default-locale selection.

  When several locales for a given language are available we were always
  selecting the first.
  Original author: rgreenwalt
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146502