Merge "Adding getManagedUserBadgedDrawableForDensity() to PackageManager." into nyc-dev