am 87a80004: am b0c27f25: Bug 2290800 - Use a collator to sort the app labels.

Merge commit '87a8000440d92be900a997f89b21e3261df872f0' into eclair-mr2-plus-aosp

* commit '87a8000440d92be900a997f89b21e3261df872f0':
  Bug 2290800 - Use a collator to sort the app labels.