Merge "Remove String version of getBadgedLabel" into lmp-dev

Author: Kenny Guy

core/java/android/os/UserManager.java

@@ -863,15 +863,6 @@ public CharSequence getBadgedLabelForUser(CharSequence label, UserHandle user) {
         return label;
     }
 
-    /**
-     * Kept during L development to simplify updating unbundled apps.
-     * TODO: Remove after 2014-08-04
-     * @hide
-     */
-    public String getBadgedLabelForUser(String label, UserHandle user) {
-        return (String) getBadgedLabelForUser((CharSequence) label, user);
-    }
-
     /**
      * If the target user is a managed profile of the calling user or the caller
      * is itself a managed profile, then this returns a drawable to use as a small