Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo