Merge "Remove some (unused, non-public) phone-related status bar notification icons" into gingerbread