am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev
am d9b5ffbc: Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev

* commit 'd9b5ffbcbdddd70158280602db3d2cfa4a31cd4a':
  Revert "Remove String version of getBadgedLabel"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base